The solution we adopted